From dde72a86e00e09f960c1ea820e43b07f0939f88f Mon Sep 17 00:00:00 2001 From: Isaku Yamahata Date: Mon, 2 Mar 2009 16:52:22 +0900 Subject: [PATCH] [IA64] This is consistent with the x86 version of this function. Signed-off-by: Simon Horman --HG-- rename : xen/include/asm-ia64/linux/asm/hw_irq.h => xen/include/asm-ia64/linux-xen/asm/hw_irq.h --- xen/arch/ia64/linux-xen/irq_ia64.c | 9 +++------ xen/arch/ia64/linux-xen/mca.c | 3 --- xen/include/asm-ia64/hvm/iommu.h | 4 ++-- xen/include/asm-ia64/linux-xen/asm/README.origin | 1 + xen/include/asm-ia64/{linux => linux-xen}/asm/hw_irq.h | 3 +++ xen/include/asm-ia64/linux/asm/README.origin | 1 - 6 files changed, 9 insertions(+), 12 deletions(-) rename xen/include/asm-ia64/{linux => linux-xen}/asm/hw_irq.h (98%) diff --git a/xen/arch/ia64/linux-xen/irq_ia64.c b/xen/arch/ia64/linux-xen/irq_ia64.c index 4a782fb33c..c20b021adf 100644 --- a/xen/arch/ia64/linux-xen/irq_ia64.c +++ b/xen/arch/ia64/linux-xen/irq_ia64.c @@ -242,10 +242,6 @@ static struct irqaction ipi_irqaction = { }; #endif -#ifdef XEN -extern void setup_vector (unsigned int vec, struct irqaction *action); -#endif - void register_percpu_irq (ia64_vector vec, struct irqaction *action) { @@ -276,7 +272,7 @@ int request_irq_vector(unsigned int vector, unsigned long irqflags, const char * devname, void *dev_id) { struct irqaction * action; - int retval=0; + int retval; /* * Sanity-check: shared interrupts must pass in a real dev-ID, @@ -295,7 +291,8 @@ int request_irq_vector(unsigned int vector, action->handler = handler; action->name = devname; action->dev_id = dev_id; - setup_vector(vector, action); + + retval = setup_vector(vector, action); if (retval) xfree(action); diff --git a/xen/arch/ia64/linux-xen/mca.c b/xen/arch/ia64/linux-xen/mca.c index d682e90d69..8e9d9f7401 100644 --- a/xen/arch/ia64/linux-xen/mca.c +++ b/xen/arch/ia64/linux-xen/mca.c @@ -112,9 +112,6 @@ unsigned long __per_cpu_mca[NR_CPUS]; /* In mca_asm.S */ extern void ia64_monarch_init_handler (void); extern void ia64_slave_init_handler (void); -#ifdef XEN -extern void setup_vector (unsigned int vec, struct irqaction *action); -#endif static ia64_mc_info_t ia64_mc_info; diff --git a/xen/include/asm-ia64/hvm/iommu.h b/xen/include/asm-ia64/hvm/iommu.h index b33ee457f6..6d6650232a 100644 --- a/xen/include/asm-ia64/hvm/iommu.h +++ b/xen/include/asm-ia64/hvm/iommu.h @@ -4,8 +4,8 @@ #include #include #include -#include -#include +#include +#include struct iommu_ops; extern struct iommu_ops intel_iommu_ops; diff --git a/xen/include/asm-ia64/linux-xen/asm/README.origin b/xen/include/asm-ia64/linux-xen/asm/README.origin index 54085bd268..4e0986fdd5 100644 --- a/xen/include/asm-ia64/linux-xen/asm/README.origin +++ b/xen/include/asm-ia64/linux-xen/asm/README.origin @@ -10,6 +10,7 @@ cache.h -> linux/include/asm-ia64/cache.h gcc_intrin.h -> linux/include/asm-ia64/gcc_intrin.h ia64regs.h -> linux/include/asm-ia64/ia64regs.h io.h -> linux/include/asm-ia64/io.h +hw_irq.h -> linux/include/asm-ia64/hw_irq.h kregs.h -> linux/include/asm-ia64/kregs.h mca_asm.h -> linux/include/asm-ia64/mca_asm.h meminit.h -> linux/include/asm-ia64/meminit.h diff --git a/xen/include/asm-ia64/linux/asm/hw_irq.h b/xen/include/asm-ia64/linux-xen/asm/hw_irq.h similarity index 98% rename from xen/include/asm-ia64/linux/asm/hw_irq.h rename to xen/include/asm-ia64/linux-xen/asm/hw_irq.h index 579ec6a9e3..9578cd965e 100644 --- a/xen/include/asm-ia64/linux/asm/hw_irq.h +++ b/xen/include/asm-ia64/linux-xen/asm/hw_irq.h @@ -85,7 +85,10 @@ extern int assign_irq_vector (int irq); /* allocate a free vector */ extern void free_irq_vector (int vector); extern void ia64_send_ipi (int cpu, int vector, int delivery_mode, int redirect); extern void register_percpu_irq (ia64_vector vec, struct irqaction *action); +#ifdef XEN extern int xen_do_IRQ(ia64_vector vector); +extern int setup_vector(unsigned int vec, struct irqaction *action); +#endif static inline void hw_resend_irq (struct hw_interrupt_type *h, unsigned int vector) diff --git a/xen/include/asm-ia64/linux/asm/README.origin b/xen/include/asm-ia64/linux/asm/README.origin index 612cec3f56..778d9a823d 100644 --- a/xen/include/asm-ia64/linux/asm/README.origin +++ b/xen/include/asm-ia64/linux/asm/README.origin @@ -17,7 +17,6 @@ dma.h -> linux/include/asm-ia64/dma.h fpswa.h -> linux/include/asm-ia64/fpswa.h fpu.h -> linux/include/asm-ia64/fpu.h hdreg.h -> linux/include/asm-ia64/hdreg.h -hw_irq.h -> linux/include/asm-ia64/hw_irq.h intrinsics.h -> linux/include/asm-ia64/intrinsics.h ioctl.h -> linux/include/asm-ia64/ioctl.h irq.h -> linux/include/asm-ia64/irq.h -- 2.30.2